From 9a74026a08cea9910e704b687148172805b4b86a Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Mon, 10 Apr 2006 14:47:51 +0100 Subject: [PATCH] I used the wrong operator in a couple places for putting together some error messages out of format strings. This patch corrects those operators and fixes the strings. Signed-off-by: Ryan Wilson --- tools/python/xen/xend/server/pciif.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py index aa222691f6..053b66adcb 100644 --- a/tools/python/xen/xend/server/pciif.py +++ b/tools/python/xen/xend/server/pciif.py @@ -115,7 +115,7 @@ class PciController(DevController): dev = PciDevice(domain, bus, slot, func) except Exception, e: raise VmError("pci: failed to locate device and "+ - "parse it's resources - %s"+str(e)) + "parse it's resources - "+str(e)) if dev.driver!='pciback': raise VmError(("pci: PCI Backend does not own device "+ \ @@ -131,7 +131,7 @@ class PciController(DevController): nr_ports = size, allow_access = True) if rc<0: raise VmError(('pci: failed to configure I/O ports on device '+ - '%s - errno=%d')&(dev.name,rc)) + '%s - errno=%d')%(dev.name,rc)) for (start, size) in dev.iomem: # Convert start/size from bytes to page frame sizes @@ -147,7 +147,7 @@ class PciController(DevController): allow_access = True) if rc<0: raise VmError(('pci: failed to configure I/O memory on device '+ - '%s - errno=%d')&(dev.name,rc)) + '%s - errno=%d')%(dev.name,rc)) if dev.irq>0: log.debug('pci: enabling irq %d'%dev.irq) @@ -155,7 +155,7 @@ class PciController(DevController): allow_access = True) if rc<0: raise VmError(('pci: failed to configure irq on device '+ - '%s - errno=%d')&(dev.name,rc)) + '%s - errno=%d')%(dev.name,rc)) def waitForBackend(self,devid): return (0, "ok - no hotplug") -- 2.30.2